Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 17:51:53 +0000 (09:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 17:51:53 +0000 (09:51 -0800)
commit162d2061fb49c3307f04c31a2851d7e82b8b9e1f
tree9cf77bc71abe00d34fe85ae84552094c6e46889e
parent28842d0ae120e7b71fb75a92ce90337ef4d89e92
parent863bb49b22aab0037c71e2eb647680354f95af81
Merge from mainline.